Make 'bool' output the 0/1 in the help instead of the various strings.

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index a9c50c8533419adcc3c751e6036bc619864dfd78..184b37c32a107db36388aa55ecfe349bbff8205a 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -44,7 +44,7 @@ static
 arglist_t garmin_args[] = {
        { "snlen", &snlen, "Length of generated shortnames", NULL, 
                ARGTYPE_INT },
-       { "snwhite", &snwhiteopt, "(0/1) Allow whitespace synth. shortnames",
+       { "snwhite", &snwhiteopt, "Allow whitespace synth. shortnames",
                NULL, ARGTYPE_BOOL},
        { "deficon", &deficon, "Default icon name", NULL, ARGTYPE_STRING },
        { "get_posn", &getposn, "Return current position as a waypoint", 

diff --git a/gpsbabel/mapsource.c b/gpsbabel/mapsource.c
index 88f849502b9c3151c1351cbbae5ccebe8f98f7b1..200efe710b18d430e3608cfc83ad5e36395157b6 100644 (file)
--- a/gpsbabel/mapsource.c
+++ b/gpsbabel/mapsource.c
@@ -75,7 +75,7 @@ char *mpsuseprox = NULL;
 static
 arglist_t mps_args[] = {
        {"snlen", &snlen, "Length of generated shortnames", NULL, ARGTYPE_INT },
-       { "snwhite", &snwhiteopt, "(0/1) Allow whitespace synth. shortnames",
+       { "snwhite", &snwhiteopt, "Allow whitespace synth. shortnames",
                NULL, ARGTYPE_BOOL},
        {"mpsverout", &mpsverout, 
                "Version of mapsource file to generate (3,4,5)", NULL,

diff --git a/gpsbabel/ozi.c b/gpsbabel/ozi.c
index 0377f899afbb4694fb2f64b2883926abaf6fc8ac..29b7c3eeb7b5094685c788fc242d5d264fd96b31 100644 (file)
--- a/gpsbabel/ozi.c
+++ b/gpsbabel/ozi.c
@@ -49,11 +49,11 @@ static
 arglist_t ozi_args[] = {
        {"snlen", &snlenopt, "Max synthesized shortname length",
                NULL, ARGTYPE_INT},
-       {"snwhite", &snwhiteopt, "(0/1) Allow whitespace synth. shortnames",
+       {"snwhite", &snwhiteopt, "Allow whitespace synth. shortnames",
                NULL, ARGTYPE_BOOL},
-       {"snupper", &snupperopt, "(0/1) UPPERCASE synth. shortnames",
+       {"snupper", &snupperopt, "UPPERCASE synth. shortnames",
                NULL, ARGTYPE_BOOL},
-       {"snunique", &snuniqueopt, "(0/1) Make synth. shortnames unique",
+       {"snunique", &snuniqueopt, "Make synth. shortnames unique",
                NULL, ARGTYPE_BOOL},
        {0, 0, 0, 0, 0}
 };

diff --git a/gpsbabel/tpo.c b/gpsbabel/tpo.c
index 5866f6d04e9ab178f752fbdd1cd4412465fb0bba..8ee9e454ebd2d207d16b5c25de6dae3cd4c5a603 100644 (file)
--- a/gpsbabel/tpo.c
+++ b/gpsbabel/tpo.c
@@ -32,7 +32,7 @@ static char *output_state = NULL;
   
 static
 arglist_t tpo_args[] = {
-       { "dumpheader", &dumpheader, "(0/1) Display the file header bytes", 
+       { "dumpheader", &dumpheader, "Display the file header bytes", 
                "0", ARGTYPE_BOOL} , 
        { "state", &output_state, "State map format to write, default=CA", 
          "CA", ARGTYPE_STRING} , 

diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index e49863554a82fe91ff22d413b15d7411d867d7e4..03b7c5ae74a3e561aa9175bc901b6ecff7de9f64 100644 (file)
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -742,8 +742,11 @@ disp_vecs(void)
                printf(VEC_FMT, svp[i]->name, svp[i]->desc);
                for (ap = svp[i]->vec->args; ap && ap->argstring; ap++) {
                        if ( !(ap->argtype & ARGTYPE_HIDDEN)) 
-                               printf("          %-18.18s    %-.50s %s\n",
-                               ap->argstring, ap->helpstring,
+                               printf("          %-18.18s    %s%-.50s %s\n",
+                               ap->argstring, 
+                               (ap->argtype & ARGTYPE_TYPEMASK) == 
+                                       ARGTYPE_BOOL ? "(0/1) " : "",
+                               ap->helpstring,
                                (ap->argtype & ARGTYPE_REQUIRED)?"(required)":"");
                }
        }

diff --git a/gpsbabel/xcsv.c b/gpsbabel/xcsv.c
index cfcd27d5c8c7590c290a25570329aaaa9d4bc876..5cff74c769022d61649a2d859da2240e9ccc5932 100644 (file)
--- a/gpsbabel/xcsv.c
+++ b/gpsbabel/xcsv.c
@@ -46,11 +46,11 @@ arglist_t xcsv_args[] = {
                ARGTYPE_FILE | ARGTYPE_REQUIRED },
        {"snlen", &snlenopt, "Max synthesized shortname length", NULL,
                ARGTYPE_INT},
-       {"snwhite", &snwhiteopt, "(0/1) Allow whitespace synth. shortnames",
+       {"snwhite", &snwhiteopt, "Allow whitespace synth. shortnames",
                NULL, ARGTYPE_BOOL},
-       {"snupper", &snupperopt, "(0/1) UPPERCASE synth. shortnames",
+       {"snupper", &snupperopt, "UPPERCASE synth. shortnames",
                NULL, ARGTYPE_BOOL},
-       {"snunique", &snuniqueopt, "(0/1) Make synth. shortnames unique",
+       {"snunique", &snuniqueopt, "Make synth. shortnames unique",
                NULL, ARGTYPE_BOOL},
        {"urlbase", &xcsv_urlbase, "Basename prepended to URL on output",
                NULL, ARGTYPE_STRING},